-
Download DiffMerge from here. It's not the prettiest merge tool but it works.
-
Install it as usual
-
Open up a console and run the following commands:
git config --global merge.tool diffmerge git config --global mergetool.diffmerge.cmd 'diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"'
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
use core::convert::TryFrom; | |
use embedded_time::rate::{Extensions, Hertz}; | |
use rtic::{rtic_monotonic::Clock, Monotonic}; | |
use stm32l0xx_hal::{ | |
pac::{TIM2, TIM21, TIM22, TIM3}, | |
rcc::Rcc, | |
}; | |
pub trait TimExt { | |
fn configure(&mut self, rcc: &mut Rcc, frequency: Hertz); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
use rtic::{rtic_monotonic::Clock, Monotonic}; | |
use stm32l0xx_hal::pac::TIM2; | |
pub struct Tim2Monotonic { | |
local_timer: TIM2, | |
overflows: u16, | |
next_compare_value: Option<u32>, | |
} | |
impl Tim2Monotonic { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
version: "3" | |
services: | |
adminer: | |
image: adminer:4.7.7 | |
ports: | |
- "8081:8080" | |
networks: | |
- bbench | |
postgres: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
linux_steps: &linux_steps | |
docker: | |
- image: cimg/rust:1.47.0 | |
steps: | |
- checkout | |
- restore_cache: | |
keys: | |
- v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "Cargo.lock" }} | |
- run: ./linux_build_script_1_here.sh | |
- run: ./linux_build_script_2_here.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#![no_std] | |
#![no_main] | |
use panic_semihosting as _; | |
use rtfm::app; | |
use stm32f1xx_hal::{ | |
device, gpio, | |
gpio::{gpioc::PC13, Edge, ExtiPin, Output, PushPull, State}, | |
prelude::*, | |
stm32, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
//! Interface factory | |
//! | |
//! This is the easiest way to create a driver instance. You can set various parameters of the | |
//! driver and give it an interface to use. The builder will return a | |
//! [`mode::RawMode`](../mode/raw/struct.RawMode.html) object which you should coerce to a richer | |
//! display mode, like [mode::Graphics](../mode/graphics/struct.GraphicsMode.html) for drawing | |
//! primitives and text. | |
//! | |
//! # Examples | |
//! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
namespace Model; | |
use RedBean_Facade as R; | |
class ImgurAPI extends \Pliers\Model { | |
protected $user; | |
protected $session; | |
public function __construct() { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
var express = require('express'); | |
var app = express(); | |
var server = require('http').createServer(app); | |
var io = require('socket.io').listen(server); | |
app.get('/', function(req, res) { | |
res.sendfile(__dirname + '/index.html'); | |
}); | |
app.use('/public', express.static(__dirname + '/public')); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* Copyright (c) 2015 Gordon Williams, Pur3 Ltd. Modified by James Waples 2018 */ | |
/* | |
Library for interfacing to the EspressIF ESP8266. Uses the 'NetworkJS' | |
library to provide a JS endpoint for HTTP. | |
For EspressIF ESP8266 firmware 0.25 | |
*/ | |
var at; | |
var socks = []; |
NewerOlder