]> git.neil.brown.name Git - edlib.git/commit
projects / edlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 14897a4) | patch
wiggle: include merge number in attached attributes.
authorNeilBrown <neil@brown.name>
Mon, 12 Jun 2023 11:53:37 +0000 (21:53 +1000)
committerNeilBrown <neil@brown.name>
Wed, 28 Jun 2023 07:51:41 +0000 (17:51 +1000)
commit814bd39b5abb6aba3997f4aec1ae82368160fd79
tree12e40c1cbdfac756be6153d49e9a0ffb594b3f45tree | snapshot
parent14897a4dac389376805c05d8a7a15941c68655a6commit | diff
wiggle: include merge number in attached attributes.

By including the merge number, it is possible to find corresponding
locations in the different branches.

Also add a leading 'M' if this is the start of a merge, or 'L' if the
start of a line within a merge.

Signed-off-by: NeilBrown <neil@brown.name>
lib-wiggle.c diff | blob | history
python/lib-mergeview.py diff | blob | history
Because one more editor is never engough