Mercurial > hg > mercurial-crew-with-dirclash
log hgmerge @ 1959:d53a18f592be
age | author | description |
---|---|---|
Sat, 11 Mar 2006 21:33:19 -0800 | Vadim Gelfer | run merge program in repo root. |
Fri, 10 Mar 2006 23:34:36 -0800 | Vadim Gelfer | merge with self. |
Fri, 10 Mar 2006 23:34:02 -0800 | Vadim Gelfer | give more info to hgmerge script. |
Fri, 10 Mar 2006 23:25:50 -0800 | Vadim Gelfer | undo edit that was accident. |
Fri, 10 Mar 2006 22:24:19 -0800 | Vadim Gelfer | fix broken environment save/restore when a hook runs. |
Thu, 23 Feb 2006 18:10:04 +0100 | Radoslaw Szkodzinski | hgmerge: do not use file with markers in tools merging themselves |
Thu, 23 Feb 2006 14:42:47 +0100 | Thomas Arendsen Hein | Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work. |