File: xx-git-resolve

package info (click to toggle)
xxdiff 1%3A4.0.1%2Bhg487%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 4,724 kB
  • ctags: 2,250
  • sloc: cpp: 18,524; python: 6,134; sh: 1,550; ansic: 1,537; perl: 308; lex: 284; yacc: 279; lisp: 250; tcl: 213; makefile: 86
file content (11 lines) | stat: -rwxr-xr-x 254 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
 
#!/bin/bash
# Resolve merge conflicts with xxdiff.
FILENAME=$1
OUT=$(xxdiff --merged="${FILENAME}" --unmerge --decision "${FILENAME}")

if [ "x$OUT" = "xNODECISION" -o "x$OUT" = "x" ]; then
    exit 1
fi

git add "${FILENAME}"
echo "Marked as resolved."