log tests/test-shelve.t @ 21757:c00822e0b8ea

age author description
Thu, 05 Jun 2014 22:20:32 +0900 FUJIWARA Katsunori shelve: add option combination tests for refactoring in succeeding patch
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Fri, 23 May 2014 13:10:31 -0700 Siddharth Agarwal resolve: don't abort resolve -l even when no merge is in progress
Thu, 08 May 2014 16:55:56 -0700 Durham Goode rebase: specify custom conflict marker labels for rebase (BC)
Thu, 08 May 2014 16:50:22 -0700 Durham Goode merge: add conflict marker formatter (BC)
Fri, 09 May 2014 14:46:50 -0500 Matt Mackall resolve: simplify "finished" message
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214)