]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dce0754) | patch
Browser: edit merge in a temporary file.
authorNeilBrown <neilb@suse.de>
Thu, 22 Aug 2013 03:24:40 +0000 (13:24 +1000)
committerNeilBrown <neilb@suse.de>
Thu, 22 Aug 2013 03:24:40 +0000 (13:24 +1000)
commitbb7fbc555970da14b62c3c2b3af18d5d3bf31fd7
treeb7c2febf9591228adf878d18ae94a5d896348e8dtree | snapshot
parentdce07549b6983eadceaeeccba2702b08e2d3d2f5commit | diff
Browser: edit merge in a temporary file.

When editing a merge, do so in a temp file so it is still
easy to revert to the original.

Signed-off-by: NeilBrown <neilb@suse.de>
merge2.c diff | blob | history
vpatch.c diff | blob | history
wiggle.h diff | blob | history
apply rejected patches and perform word-wise diffs