From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 23:11:05 +0000 (-0800)
Subject: Merge branch 'da/mergetool-xxdiff-hotkey' into maint
X-Git-Tag: v2.11.1~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d1f93acfa79568ff60633ff09aa752f43cf8f5f;p=thirdparty%2Fgit.git

Merge branch 'da/mergetool-xxdiff-hotkey' into maint

The way to specify hotkeys to "xxdiff" that is used by "git
mergetool" has been modernized to match recent versions of xxdiff.

* da/mergetool-xxdiff-hotkey:
  mergetools: fix xxdiff hotkeys
---

6d1f93acfa79568ff60633ff09aa752f43cf8f5f
diff --cc mergetools/xxdiff
index e284811ff2,cc3b2f0e31..ce5b8e9f29
--- a/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@@ -15,9 -16,10 +15,9 @@@ merge_cmd () 
  			--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
  	else
  		"$merge_tool_path" -X $extra \
- 			-R 'Accel.SaveAsMerged: "Ctrl-S"' \
+ 			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
  			-R 'Accel.Search: "Ctrl+F"' \
- 			-R 'Accel.SearchForward: "Ctrl-G"' \
+ 			-R 'Accel.SearchForward: "Ctrl+G"' \
  			--merged-file "$MERGED" "$LOCAL" "$REMOTE"
  	fi
 -	check_unchanged
  }